]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Ensure that we provide CFLAGS and LIBS for Wayland builds
authorEmmanuele Bassi <ebassi@gnome.org>
Wed, 28 Aug 2013 10:12:23 +0000 (11:12 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 28 Aug 2013 10:12:23 +0000 (11:12 +0100)
We need to use PKG_CHECK_MODULES, not PKG_CHECK_EXISTS. We make it
non-fatal by passing a final argument to the m4 macro.

configure.ac

index 3cbcaf06826b4b90f68b10d3fd8c39cc69c18edf..21a5136ae0d2eb42751ad605f2e91e978cd4f734 100644 (file)
@@ -97,15 +97,12 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
 
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
-
-AC_MSG_CHECKING([for wayland support])
-PKG_CHECK_EXISTS([libmutter-wayland >= $MUTTER_MIN_VERSION],
+PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
                  [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
                   AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
                   have_mutter_wayland=yes],
                  [have_mutter_wayland=no])
 
-AC_MSG_RESULT($have_mutter_wayland)
 AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)